<<<<<<< .mine
package com.allen.admin.service.common.domain;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.*;

public class AdminUser implements Serializable {
	
	/**
	 * 
	 */
	private static final long serialVersionUID = 1394955991043747062L;
	
	/** 正常的/可用的 */
	public final static int STATUS_ENABLED = 1;
	/** 禁用的 */
	public final static int STATUS_DISABLED = 2;
	/** 离职的 */
	public final static int STATUS_FORMER = 3;
	
	public static Map<Integer, String> statusMap = new HashMap<>();
	public static JSONArray statusArr = new JSONArray();
	
	private static JSONObject kvObj(Integer key, String value) {
		JSONObject kvObj = new JSONObject();
		kvObj.put("key", key);
		kvObj.put("value", value);
		return kvObj;
	}
	
	static {
		statusMap.put(STATUS_ENABLED, "正常");
		statusMap.put(STATUS_DISABLED, "禁用");
		statusMap.put(STATUS_FORMER, "离职");
		
		statusArr.add(kvObj(STATUS_ENABLED, "正常"));
		statusArr.add(kvObj(STATUS_DISABLED, "禁用"));
		statusArr.add(kvObj(STATUS_FORMER, "离职"));
	}

	private Long id;
	private String account;
	private String password;
	private String name;
	private String nickname;
	private String avatar;
	private Integer departmentId;
	private String roleIds;
	private String roleNames;
	private String email;
	private String mobile;
	private String mobileCode;
	private Integer status;
	private String remark;
	private String createdBy;
	private String updatedBy;
	private LocalDateTime createdTime;
	private LocalDateTime updatedTime;
	
	public List<Integer> roleIdsList() {
		List<Integer> result = new ArrayList<Integer>();
		
		if (roleIds != null && roleIds.length() == 0) {
			return result;
		}
		
		String[] roleIdStrs = roleIds.split(",");
		for (String roleId : roleIdStrs) {
    		try {
				int tmp = Integer.parseUnsignedInt(roleId);
				result.add(tmp);
			} catch (NumberFormatException e) {
				System.out.println(e.getMessage());

			}
    	}
		
		return result;
	}
	
	public List<String> roleNamesList() {
		if (roleNames != null && roleNames.length() == 0) {
			return new ArrayList<String>(0);
		}
		return Arrays.asList(roleNames.split(","));
	}

	/**
	 * @return the id
	 */
	public Long getId() {
		return id;
	}

	/**
	 * @param id
	 *            the id to set
	 */
	public void setId(Long id) {
		this.id = id;
	}

	/**
	 * @return the account
	 */
	public String getAccount() {
		return account;
	}

	/**
	 * @param account
	 *            the account to set
	 */
	public void setAccount(String account) {
		this.account = account;
	}

	/**
	 * @return the password
	 */
	public String getPassword() {
		return password;
	}

	/**
	 * @param password
	 *            the password to set
	 */
	public void setPassword(String password) {
		this.password = password;
	}

	/**
	 * @return the name
	 */
	public String getName() {
		return name;
	}

	/**
	 * @param name
	 *            the name to set
	 */
	public void setName(String name) {
		this.name = name;
	}

	/**
	 * @return the nickname
	 */
	public String getNickname() {
		return nickname;
	}

	/**
	 * @param nickname
	 *            the nickname to set
	 */
	public void setNickname(String nickname) {
		this.nickname = nickname;
	}

	/**
	 * @return the avatar
	 */
	public String getAvatar() {
		return avatar;
	}

	/**
	 * @param avatar
	 *            the avatar to set
	 */
	public void setAvatar(String avatar) {
		this.avatar = avatar;
	}

	/**
	 * @return the departmentId
	 */
	public Integer getDepartmentId() {
		return departmentId;
	}

	/**
	 * @param departmentId
	 *            the departmentId to set
	 */
	public void setDepartmentId(Integer departmentId) {
		this.departmentId = departmentId;
	}

	/**
	 * @return the roleIds
	 */
	public String getRoleIds() {
		return roleIds;
	}

	/**
	 * @param roleIds
	 *            the roleIds to set
	 */
	public void setRoleIds(String roleIds) {
		this.roleIds = roleIds;
	}

	/**
	 * @return the roleNames
	 */
	public String getRoleNames() {
		return roleNames;
	}

	/**
	 * @param roleNames
	 *            the roleNames to set
	 */
	public void setRoleNames(String roleNames) {
		this.roleNames = roleNames;
	}

	/**
	 * @return the email
	 */
	public String getEmail() {
		return email;
	}

	/**
	 * @param email the email to set
	 */
	public void setEmail(String email) {
		this.email = email;
	}

	/**
	 * @return the mobile
	 */
	public String getMobile() {
		return mobile;
	}

	/**
	 * @param mobile the mobile to set
	 */
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}

	/**
	 * @return the mobileCode
	 */
	public String getMobileCode() {
		return mobileCode;
	}

	/**
	 * @param mobileCode the mobileCode to set
	 */
	public void setMobileCode(String mobileCode) {
		this.mobileCode = mobileCode;
	}

	/**
	 * @return the status
	 */
	public Integer getStatus() {
		return status;
	}

	/**
	 * @param status
	 *            the status to set
	 */
	public void setStatus(Integer status) {
		this.status = status;
	}

	/**
	 * @return the remark
	 */
	public String getRemark() {
		return remark;
	}

	/**
	 * @param remark
	 *            the remark to set
	 */
	public void setRemark(String remark) {
		this.remark = remark;
	}

	/**
	 * @return the createdBy
	 */
	public String getCreatedBy() {
		return createdBy;
	}

	/**
	 * @param createdBy
	 *            the createdBy to set
	 */
	public void setCreatedBy(String createdBy) {
		this.createdBy = createdBy;
	}

	/**
	 * @return the updatedBy
	 */
	public String getUpdatedBy() {
		return updatedBy;
	}

	/**
	 * @param updatedBy
	 *            the updatedBy to set
	 */
	public void setUpdatedBy(String updatedBy) {
		this.updatedBy = updatedBy;
	}

	/**
	 * @return the createdTime
	 */
	public LocalDateTime getCreatedTime() {
		return createdTime;
	}

	/**
	 * @param createdTime
	 *            the createdTime to set
	 */
	public void setCreatedTime(LocalDateTime createdTime) {
		this.createdTime = createdTime;
	}

	/**
	 * @return the updatedTime
	 */
	public LocalDateTime getUpdatedTime() {
		return updatedTime;
	}

	/**
	 * @param updatedTime
	 *            the updatedTime to set
	 */
	public void setUpdatedTime(LocalDateTime updatedTime) {
		this.updatedTime = updatedTime;
	}

}
=======
package com.allen.admin.service.common.domain;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.*;

public class AdminUser implements Serializable {
	
	/**
	 * 
	 */
	private static final long serialVersionUID = 1394955991043747062L;
	
	/** 正常的/可用的 */
	public final static int STATUS_ENABLED = 1;
	/** 禁用的 */
	public final static int STATUS_DISABLED = 2;
	/** 离职的 */
	public final static int STATUS_FORMER = 3;
	
	public static Map<Integer, String> statusMap = new HashMap<>();
	public static JSONArray statusArr = new JSONArray();
	
	private static JSONObject kvObj(Integer key, String value) {
		JSONObject kvObj = new JSONObject();
		kvObj.put("key", key);
		kvObj.put("value", value);
		return kvObj;
	}
	
	static {
		statusMap.put(STATUS_ENABLED, "正常");
		statusMap.put(STATUS_DISABLED, "禁用");
		statusMap.put(STATUS_FORMER, "离职");
		
		statusArr.add(kvObj(STATUS_ENABLED, "正常"));
		statusArr.add(kvObj(STATUS_DISABLED, "禁用"));
		statusArr.add(kvObj(STATUS_FORMER, "离职"));
	}

	private Long id;
	private String account;
	private String password;
	private String name;
	private String nickname;
	private String avatar;
	private Integer departmentId;
	private String roleIds;
	private String roleNames;
	private String email;
	private String mobile;
	private String mobileCode;
	private Integer status;
	private String remark;
	private String createdBy;
	private String updatedBy;
	private LocalDateTime createdTime;
	private LocalDateTime updatedTime;
	
	public List<Integer> roleIdsList() {
		List<Integer> result = new ArrayList<Integer>();
		
		if (roleIds != null && roleIds.length() == 0) {
			return result;
		}
		
		String[] roleIdStrs = roleIds.split(",");
		for (String roleId : roleIdStrs) {
    		try {
				int tmp = Integer.parseUnsignedInt(roleId);
				result.add(tmp);
			} catch (NumberFormatException e) {
				System.out.println(e.getMessage());
//				logger.error("角色ID["+id+"] 数值转换异常!", e);
			}
    	}
		
		return result;
	}
	
	public List<String> roleNamesList() {
		if (roleNames != null && roleNames.length() == 0) {
			return new ArrayList<String>(0);
		}
		return Arrays.asList(roleNames.split(","));
	}

	/**
	 * @return the id
	 */
	public Long getId() {
		return id;
	}

	/**
	 * @param id
	 *            the id to set
	 */
	public void setId(Long id) {
		this.id = id;
	}

	/**
	 * @return the account
	 */
	public String getAccount() {
		return account;
	}

	/**
	 * @param account
	 *            the account to set
	 */
	public void setAccount(String account) {
		this.account = account;
	}

	/**
	 * @return the password
	 */
	public String getPassword() {
		return password;
	}

	/**
	 * @param password
	 *            the password to set
	 */
	public void setPassword(String password) {
		this.password = password;
	}

	/**
	 * @return the name
	 */
	public String getName() {
		return name;
	}

	/**
	 * @param name
	 *            the name to set
	 */
	public void setName(String name) {
		this.name = name;
	}

	/**
	 * @return the nickname
	 */
	public String getNickname() {
		return nickname;
	}

	/**
	 * @param nickname
	 *            the nickname to set
	 */
	public void setNickname(String nickname) {
		this.nickname = nickname;
	}

	/**
	 * @return the avatar
	 */
	public String getAvatar() {
		return avatar;
	}

	/**
	 * @param avatar
	 *            the avatar to set
	 */
	public void setAvatar(String avatar) {
		this.avatar = avatar;
	}

	/**
	 * @return the departmentId
	 */
	public Integer getDepartmentId() {
		return departmentId;
	}

	/**
	 * @param departmentId
	 *            the departmentId to set
	 */
	public void setDepartmentId(Integer departmentId) {
		this.departmentId = departmentId;
	}

	/**
	 * @return the roleIds
	 */
	public String getRoleIds() {
		return roleIds;
	}

	/**
	 * @param roleIds
	 *            the roleIds to set
	 */
	public void setRoleIds(String roleIds) {
		this.roleIds = roleIds;
	}

	/**
	 * @return the roleNames
	 */
	public String getRoleNames() {
		return roleNames;
	}

	/**
	 * @param roleNames
	 *            the roleNames to set
	 */
	public void setRoleNames(String roleNames) {
		this.roleNames = roleNames;
	}

	/**
	 * @return the email
	 */
	public String getEmail() {
		return email;
	}

	/**
	 * @param email the email to set
	 */
	public void setEmail(String email) {
		this.email = email;
	}

	/**
	 * @return the mobile
	 */
	public String getMobile() {
		return mobile;
	}

	/**
	 * @param mobile the mobile to set
	 */
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}

	/**
	 * @return the mobileCode
	 */
	public String getMobileCode() {
		return mobileCode;
	}

	/**
	 * @param mobileCode the mobileCode to set
	 */
	public void setMobileCode(String mobileCode) {
		this.mobileCode = mobileCode;
	}

	/**
	 * @return the status
	 */
	public Integer getStatus() {
		return status;
	}

	/**
	 * @param status
	 *            the status to set
	 */
	public void setStatus(Integer status) {
		this.status = status;
	}

	/**
	 * @return the remark
	 */
	public String getRemark() {
		return remark;
	}

	/**
	 * @param remark
	 *            the remark to set
	 */
	public void setRemark(String remark) {
		this.remark = remark;
	}

	/**
	 * @return the createdBy
	 */
	public String getCreatedBy() {
		return createdBy;
	}

	/**
	 * @param createdBy
	 *            the createdBy to set
	 */
	public void setCreatedBy(String createdBy) {
		this.createdBy = createdBy;
	}

	/**
	 * @return the updatedBy
	 */
	public String getUpdatedBy() {
		return updatedBy;
	}

	/**
	 * @param updatedBy
	 *            the updatedBy to set
	 */
	public void setUpdatedBy(String updatedBy) {
		this.updatedBy = updatedBy;
	}

	/**
	 * @return the createdTime
	 */
	public LocalDateTime getCreatedTime() {
		return createdTime;
	}

	/**
	 * @param createdTime
	 *            the createdTime to set
	 */
	public void setCreatedTime(LocalDateTime createdTime) {
		this.createdTime = createdTime;
	}

	/**
	 * @return the updatedTime
	 */
	public LocalDateTime getUpdatedTime() {
		return updatedTime;
	}

	/**
	 * @param updatedTime
	 *            the updatedTime to set
	 */
	public void setUpdatedTime(LocalDateTime updatedTime) {
		this.updatedTime = updatedTime;
	}

}
>>>>>>> .theirs
